Skip to content

Comments

assistant/codecompanion: fix diff options#1381

Merged
NotAShelf merged 2 commits intoNotAShelf:mainfrom
snoweuph:fix/code-companion
Feb 1, 2026
Merged

assistant/codecompanion: fix diff options#1381
NotAShelf merged 2 commits intoNotAShelf:mainfrom
snoweuph:fix/code-companion

Conversation

@snoweuph
Copy link
Contributor

@snoweuph snoweuph commented Feb 1, 2026

just tried it out for fun and noticed that the inlining didnt work. looks like the packge was updated, but not the options.

Sanity Checking

  • I have updated the changelog as per my changes
  • I have tested, and self-reviewed my code
  • My changes fit guidelines found in hacking nvf
  • Style and consistency
    • I ran Alejandra to format my code (nix fmt)
    • My code conforms to the editorconfig configuration of the project
    • My changes are consistent with the rest of the codebase
  • If new changes are particularly complex:
    • My code includes comments in particularly complex areas
    • I have added a section in the manual
    • (For breaking changes) I have included a migration guide
  • Package(s) built:
    • .#nix (default package)
    • .#maximal
    • .#docs-html (manual, must build)
    • .#docs-linkcheck (optional, please build if adding links)
  • Tested on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin

Add a 👍 reaction to pull requests you find important.

@NotAShelf NotAShelf enabled auto-merge February 1, 2026 21:42
@snoweuph
Copy link
Contributor Author

snoweuph commented Feb 1, 2026

@NotAShelf do I need to rebase, or will this still automerge?

image

@NotAShelf
Copy link
Owner

Auto-merge should work regardless of branch status, but the UI was indicating a CI failure... without showing me where...

@snoweuph
Copy link
Contributor Author

snoweuph commented Feb 1, 2026

Auto-merge should work regardless of branch status, but the UI was indicating a CI failure... without showing me where...

So GitHub was doing a #1377 :trollface:

github-actions bot pushed a commit that referenced this pull request Feb 1, 2026
@github-actions
Copy link

github-actions bot commented Feb 1, 2026

🚀 Live preview deployed from ebcaf4e

View it here:

Debug Information

Triggered by: NotAShelf

HEAD at: fix/code-companion

Reruns: 2007

@NotAShelf NotAShelf merged commit 7ec2619 into NotAShelf:main Feb 1, 2026
14 checks passed
@snoweuph snoweuph deleted the fix/code-companion branch February 1, 2026 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants